update changelog for 1.1.1-1,add Merge branch info

diff --git a/debian/changelog b/debian/changelog
index f8c020fdd70519b655a809411103e305540c942b..3164ea38a1139ee3a31b1be336e8d354bd67faf1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ opencc (1.1.1-1) unstable; urgency=medium
   * New upstream version 1.1.1
   * change libopencc data pkgname from libopencc[num]-data to libopencc-data
   * change libopencc pkgname from libopencc2 to libopencc1.1
-  * update debian/libopencc1.1.install
+  * update debian/libopencc1.1.install for filename *.ocd2
   * add debian/libopencc1.1.symbols
   * d/rules:
      - delete override_dh_missing:
@@ -21,8 +21,9 @@ opencc (1.1.1-1) unstable; urgency=medium
   * delete unused patch: use-system-libraries.patch
   * d/watch: use @PACKAGE@ @ANY_VERSION@@ARCHIVE_EXT@
   * d/clean: add obj-x86_64-linux-gnu/
+  * Merge branch 'master' come from <byang@debian.org>
 
- -- xiao sheng wen <atzlinux@sina.com>  Sat, 23 May 2020 12:49:02 +0800
+ -- xiao sheng wen <atzlinux@sina.com>  Sat, 23 May 2020 14:21:50 +0800
 
 opencc (1.1.1-1~exp1) unstable; urgency=medium